[Security Solution] Fix rule snooze/unsnooze change history logging#271908
Merged
maximpn merged 3 commits intoMay 29, 2026
Merged
Conversation
|
Pinging @elastic/security-detections-response (Team:Detections and Resp) |
|
Pinging @elastic/security-solution (Team: SecuritySolution) |
|
Pinging @elastic/security-detection-rule-management (Team:Detection Rule Management) |
Contributor
💛 Build succeeded, but was flaky
Failed CI StepsMetrics [docs]
History
cc @maximpn |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Epic: https://github.com/elastic/security-team/issues/12367 (internal)
Follow-up to: #267350
Related to: #269617
Summary
Fixed rule change tracking instrumentation for RulesClient snooze and unsnooze methods.
Details
snoozeRuleandunsnoozeRuleinRulesClientperform an OCC (optimistic concurrency control) update that only modifies snooze-related attributes. The saved object returned by that update contains only the updated partial attributes, not the complete rule document. Passing that partial object tologRuleChangescaused the change history record to be missing required rule fields, breaking change tracking for snooze and unsnooze actions.The fix merges the original pre-update
attributeswithupdatedRuleRaw.attributesso thatlogRuleChangesalways receives a complete rule document.Issues were discovered during e2e testing of the UI in #269617.
snooze_rule.ts: Merge originalattributeswithupdatedRuleRaw.attributesbefore passing the saved object tologRuleChanges.unsnooze_rule.ts: Same fix.snooze_rule.test.ts,unsnooze_rule.test.ts: Add test cases that verifylogRuleChangesis called with the fully merged attributes.